bitkeeper revision 1.1472.2.4 (4290dcb3h7sEjyPmT7cQXliR-KX-iQ)
authoradsharma@linux-t08.sc.intel.com <adsharma@linux-t08.sc.intel.com>
Sun, 22 May 2005 19:25:39 +0000 (19:25 +0000)
committeradsharma@linux-t08.sc.intel.com <adsharma@linux-t08.sc.intel.com>
Sun, 22 May 2005 19:25:39 +0000 (19:25 +0000)
Merge linux-t08.sc.intel.com:/disk2/adsharma/xen-ia64/test1.bk
into linux-t08.sc.intel.com:/disk2/adsharma/xen-ia64/xeno-unstable-ia64-staging.bk

1  2 
xen/include/asm-ia64/config.h

Simple merge